gdk: Change some async dnd api

The pattern we generally follow is to put the
async result right after the source object, in
finish functions. Do this for gdk_drop_read_finish.

diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c
index 643a74d790984c60bbf5b4f43ec7a34d45d99755..ea85862a4cc8567cf7cc951c35ad8e8ab37d73ba 100644 (file)
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -149,8 +149,8 @@ gdk_drop_read_local_async (GdkDrop             *self,
 
 static GInputStream *
 gdk_drop_read_local_finish (GdkDrop         *self,
-                            const char     **out_mime_type,
                             GAsyncResult    *result,
+                            const char     **out_mime_type,
                             GError         **error)
 {
   g_return_val_if_fail (g_task_is_valid (result, self), NULL);
@@ -622,8 +622,8 @@ gdk_drop_read_async (GdkDrop             *self,
 /**
  * gdk_drop_read_finish:
  * @self: a #GdkDrop
- * @out_mime_type: (out) (type utf8): return location for the used mime type
  * @result: a #GAsyncResult
+ * @out_mime_type: (out) (type utf8): return location for the used mime type
  * @error: (allow-none): location to store error information on failure, or %NULL
  *
  * Finishes an async drop read operation, see gdk_drop_read_async().
@@ -632,8 +632,8 @@ gdk_drop_read_async (GdkDrop             *self,
  */
 GInputStream *
 gdk_drop_read_finish (GdkDrop       *self,
-                      const char   **out_mime_type,
                       GAsyncResult  *result,
+                      const char   **out_mime_type,
                       GError       **error)
 {
   g_return_val_if_fail (GDK_IS_DROP (self), NULL);
@@ -641,11 +641,11 @@ gdk_drop_read_finish (GdkDrop       *self,
 
   if (g_async_result_is_tagged (result, gdk_drop_read_local_async))
     {
-      return gdk_drop_read_local_finish (self, out_mime_type, result, error);
+      return gdk_drop_read_local_finish (self, result, out_mime_type, error);
     }
   else
     {
-      return GDK_DROP_GET_CLASS (self)->read_finish (self, out_mime_type, result, error);
+      return GDK_DROP_GET_CLASS (self)->read_finish (self, result, out_mime_type, error);
     }
 }
 
@@ -678,7 +678,7 @@ gdk_drop_read_value_got_stream (GObject      *source,
   GTask *task = data;
   const char *mime_type;
 
-  stream = gdk_drop_read_finish (GDK_DROP (source), &mime_type, result, &error);
+  stream = gdk_drop_read_finish (GDK_DROP (source), result, &mime_type, &error);
   if (stream == NULL)
     {
       g_task_return_error (task, error);

diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h
index e2f26e1822d189a0588b4fa06844d4a685aaaf9a..857d44082fdb17a65e3c8a6021322c89401a6eee 100644 (file)
--- a/gdk/gdkdrop.h
+++ b/gdk/gdkdrop.h
@@ -68,8 +68,8 @@ void                    gdk_drop_read_async             (GdkDrop
                                                          gpointer                user_data);
 GDK_AVAILABLE_IN_ALL
 GInputStream *          gdk_drop_read_finish            (GdkDrop                *self,
-                                                         const char            **out_mime_type,
                                                          GAsyncResult           *result,
+                                                         const char            **out_mime_type,
                                                          GError                **error);
 GDK_AVAILABLE_IN_ALL
 void                    gdk_drop_read_value_async       (GdkDrop                *self,

diff --git a/gdk/gdkdropprivate.h b/gdk/gdkdropprivate.h
index 86a1fdbf8aa834c38ee0ca1618e8f3f249b81afd..b20eee2ae7193649e8b14c07efb64058e522e9a9 100644 (file)
--- a/gdk/gdkdropprivate.h
+++ b/gdk/gdkdropprivate.h
@@ -51,8 +51,8 @@ struct _GdkDropClass {
                                                                  GAsyncReadyCallback     callback,
                                                                  gpointer                user_data);
   GInputStream *        (* read_finish)                         (GdkDrop                *self,
-                                                                 const char            **out_mime_type,
                                                                  GAsyncResult           *result,
+                                                                 const char            **out_mime_type,
                                                                  GError                **error);
 };
 

diff --git a/gdk/wayland/gdkdrop-wayland.c b/gdk/wayland/gdkdrop-wayland.c
index a0a02a33b41d04cf69a0bddaa1a5c82a326fc046..3e0a25deaa37149f2a3e2691d7c2a2d4260ee86f 100644 (file)
--- a/gdk/wayland/gdkdrop-wayland.c
+++ b/gdk/wayland/gdkdrop-wayland.c
@@ -224,8 +224,8 @@ gdk_wayland_drop_read_async (GdkDrop             *drop,
 
 static GInputStream *
 gdk_wayland_drop_read_finish (GdkDrop       *drop,
-                              const char   **out_mime_type,
                               GAsyncResult  *result,
+                              const char   **out_mime_type,
                               GError       **error)
 {
   GTask *task;

diff --git a/gdk/wayland/gdkprimary-wayland.c b/gdk/wayland/gdkprimary-wayland.c
index 98f75edc1f872efb4185d1860e4171eb5550ad7e..767371527e54b53530747fd079a4a93c672f8cb7 100644 (file)
--- a/gdk/wayland/gdkprimary-wayland.c
+++ b/gdk/wayland/gdkprimary-wayland.c
@@ -331,8 +331,8 @@ gdk_wayland_primary_read_async (GdkClipboard        *clipboard,
 
 static GInputStream *
 gdk_wayland_primary_read_finish (GdkClipboard  *clipboard,
-                                 const char   **out_mime_type,
                                  GAsyncResult  *result,
+                                 const char   **out_mime_type,
                                  GError       **error)
 {
   GInputStream *stream;

diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index e457ce12a494e8cafe6a3c2d7879d2b67f989308..44dab15c193118aeaeae004bbe5f6ef0127eb357 100644 (file)
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -1382,8 +1382,8 @@ gdk_win32_drop_read_async (GdkDrop             *drop,
 
 static GInputStream *
 gdk_win32_drop_read_finish (GdkDrop       *drop,
-                            const char   **out_mime_type,
                             GAsyncResult  *result,
+                            const char   **out_mime_type,
                             GError       **error)
 {
   GTask *task;

diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c
index 050695bf9c4d1f14504482c7d95fa58476dc0d9d..bb5fbef238ed91f6d5e65b8fe923f4f7850dd11e 100644 (file)
--- a/gdk/x11/gdkdrop-x11.c
+++ b/gdk/x11/gdkdrop-x11.c
@@ -211,8 +211,8 @@ gdk_x11_drop_read_async (GdkDrop             *drop,
 
 static GInputStream *
 gdk_x11_drop_read_finish (GdkDrop         *drop,
-                          const char     **out_mime_type,
                           GAsyncResult    *result,
+                          const char     **out_mime_type,
                           GError         **error)
 {
   GTask *task;

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index b8e53890271aec7b4a734ad5bed27829a9e5bee8..8c1312c383c20ede4339b6ad7854a0ed6ec473d6 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -244,7 +244,7 @@ gtk_drag_get_data_got_stream (GObject      *source,
   GInputStream *input_stream;
   GOutputStream *output_stream;
 
-  input_stream = gdk_drop_read_finish (GDK_DROP (source), &data->mime_type, result, NULL);
+  input_stream = gdk_drop_read_finish (GDK_DROP (source), result, &data->mime_type, NULL);
   if (input_stream == NULL)
     {
       gtk_drag_get_data_finish (data, NULL, 0);